merge trunk
authorK. Handa <handa@gnu.org>
Thu, 23 May 2013 12:04:26 +0000 (21:04 +0900)
committerK. Handa <handa@gnu.org>
Thu, 23 May 2013 12:04:26 +0000 (21:04 +0900)
commita910de1960f7c2e2d6a9359d03a71e4de5991f67
tree40766f02f77ed0c239eede661653340f4b05a3a8
parent9a6234def1479e3bed34892bfeabef11404bb9b4
parentd7919fd5bf45f29bff1bf87f87c49e3a48d7f2ff
merge trunk